E622 Merge

This commit merges E622 into the current master branch of Expertiza.