Code review comments - EDUCATOR-4319 undoing changes temporarily undoing changes temporarily Fixed exception handling re-added changes after hard reset removed waffle flag (wrong merge removed waffle flag (wrong merge
Code review comments - EDUCATOR-4319 undoing changes temporarily undoing changes temporarily Fixed exception handling re-added changes after hard reset removed waffle flag (wrong merge removed waffle flag (wrong merge