ENG-0 rev build for release
Merge branch 'release/0.6'