SYNC-331, reverting to master in order to fix the formatting issues