[1.3.4] Changes from 1.3.3 pr #2681