First steps to fix #3470123
requested review from @dqd
assigned to @dqd
added 1 commit
Compare with previous version
merged