GNM-1226 Merge to master
37 files changed