[MONDRIAN-1694][MONDRIAN-1766]  Merge of commits from master to lagunitas.