Merge branch 'hotfix/01.03.05'
apply psr coding standards
Merge branch 'hotfix/01.03.06' into develop