Merge branch 'sl/const'