Issues/620@v2

Work in progrees, do not review and merge