Reverting "DevSynch" to split into 2 commits.

This reverts commit 1a5883c9eb6c9e92bac63bed3bb659f88740bfdc.