Merging changes ca. 25 Dec that had been pushed to MesquiteProject