Verified issue still exists with 5.0.5. Attached updated test case: HHH-3824-5.0.5.Final.zip. See my previous comment as it still applies.