Merge remote-tracking branch 'fd/dcbw/rh863515-rh1083683-config-then-quit' into review