11345, partial for customization step 1 v03

formatting fixes