fixed issues with customizations
Merge remote-tracking branch 'origin/master'