Closes L2SS-744
added 23 commits
master
Compare with previous version
mentioned in commit d0575613
merged