11345, partial for customization step 1 v02

bugfix