Merge branch 'jk/branch-l-0-deprecation'