timob-6700: work in progress commit