MONDRIAN-1313 merging commit 0b99718367cfb4e0d1f0418563789c0dfa34ad73 from the 3.5 branch.