11345, partial for customization step 1 v04

formatting fixes