6.x Project structure is syncronized with master; #348 is merged