Fix for: BHV-9346

See commit notes and associated Jira for details.