Merge branch 'unitTests'
Merge branch 'master' into unitTests