Merge branch 'mantis-141' into dev