[DF-3489] implementation in progress
Merge branch 'origin/framework_0_5_5_grass'
[DF-185] fixing mac project