Merge branch 'mantis-139' into dev