commit from ravasarala-aimia