Merged commit from zarzonis