Bug40076 master: forward-port of !89 to master

The MR forward-ports the fix for 40076 to master, and includes solutions for merge conflicts.

See also !89 (merged) and !90 (merged) and #40076 (closed).