Merge "Add start/end padding for entity header"