commit from dev01 19:10:04