merge revision from Sattam