Merge SCL support to my working master