Merge remote-tracking branch 'origin/hivemind_optimizer_thirdtimesthecharm' into hivemind_optimizer_thirdtimesthecharm