GS-11422
added extra padding for the services layer
Merge remote-tracking branch 'origin/master'