Merge changes after testing

Merge dev changes after testing