merge V2 gkista oct24 into V2

sprint finished, everything seems in place, with @gkista