Fully implemented CDBP-309
Merge branch 'master' of https://github.com/QFrameTK/TME