commit from dev02 19:10:28
