Merge 3.2 closes issue 13557