As a note, now I'm separating issue 846 fix to #3552.