Merge "synching up SO 1.1"