As stated in this Pull Request comments, the fix for HHH-9864 Closed does not handle one-to-one bidirectional associations properly.