merge with workrefactoring - i3 to be merged