JFG-738
Update after comments
Merge branch 'JFG-738' of https://github.com/marknovozhilov/jagger into JFG-738