Merge from master branch to remove nova flag usage.