Includes minor fixes for:

• Training tasks b230c067, 9edfc990
• Evaluations tasks 20818e16, 9def23fe, 05a7bcf2, 310f3251, 4852f2fa, 79fb03f4, c35c1b4c, e6de6e8f, ac0c5833