Fix #2533066
Fix #2533069
Merge branch 'trac2533069' into dev-3.x

merge in bug #2533069
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x