dev-1009 #42

Closed
45 wants to merge 5 commits from dev-1009 into dev-0524