Feature/scl enable

Merge into local master