Added dot as test
Merge branch 'mortendev' into vm-dev
Merge branch 'tos-test' into vm-dev