Merge branch 'release/questions-fixes' into upstream/release/sunnyspring