Merge branch 'hotfix/assests-compile-gem' into develop
Updated gem lock
Merge branch 'hotfix/update-gem-lock' into develop
Merge branch 'release/update-gem-lock1'