Merge branch 'CLI-279'