ga24
Merge branch 'GA-24' of https://github.com/arturgspb/rebase-test into rc1