Merge branch 'hotfix/4.0.3'
abstract model property visibility
Merge branch 'hotfix/4.0.4' into develop