adjusted fix H-9063 for branch-0.23 to avoid merge-conflict with H-8849.