Merge pull request #526 from olegabr/master-merge

Master merge
Merge branch 'alpha-3.0' of github.com:olegabr/framework into bug-453