Fixed by part of commit rev#73015