Qaart 95

QAART 95 branch is finished and ready for pull request