Merge from scl22_JB_Opensource