[ANNOUNCE] Merged "gelato" into "master"