Merge branch 'rmehta-bcornwellmott-confirm_training' into develop