Merge "Add kModeSync" into lmp-dev