ROADMAP-1091 #minor adjustments