Fixes for broken scenarios -- Do not include the s2s questionnaires changes to the Master branch