Integrated V4 Merge

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

Need to update the exit method