Integrated V4 Merge

Appropriate elements are now removed, no labels yet in master branch