Merge branches 'feature/cmock-fixes' and 'feature/unity-fixes' into next