MXR-206 revert back exception in abstract template