Merge of the merge

Sync with dev commits