reverting revert of EB-4704 for additional fixes