fix "Location" part layout (CMO-3610)
Merge branch 'rest-location-layout'