Fixing issues with merge of feature branch to master