Few more changes for development testing
Merge branch 'master' of ../stage