11.0 add endpoint config

Merged Ignacio Goitea requested to merge 11.0-ADD-endpoint-config into 11.0-stage

Merge request reports