This issue is verified for ER2. Test passed. (This issue was fixed indirectly and changes are more complex. Can't check exact "simple" code fix.)