DO NOT MERGE UNTIL SPRINT 32 - ALF Automation

ALF created a pull request. Please pull this in.