Con 1707

work on that is continued on different branch (CON-1709)