Merge "Consistent reporting of failure conditions" into sc-dev