Merge for release

Checked during merge from feature branch to dev