Fix for checkstyle warning
Merge branch 'master' into unstable_staging