Merge Patch 1 to dev