integrating user stories
Merge branch '2.g-hotfix-1'