Feature update after merge with dev
Merge conflict resolved