Merge "SyncSM11.1 make some functions inline" into main