test from mrm-dev2 on the same line
merged changes from mrm-dev2 with dev1