[MONDRIAN-1133] Merging missed commits from master into lagunitas, required before merging changes for [MONDRIAN-1694].