Reflect changes from first stage proposal in second stage

bnc#843646