fix type in path in .spec
Fix compile warning

Fix compile warning
Merge branch 'develop' into MAX-111
Merge of new user interface changes