Hi camio,

I checkout the code from tpaviot:master, and cherry-pick your commit edc4945 and 4a6033f, without 517f147. You can find the new branch 'camio-fix-bundle-src' in my forked repo.

Build the branch 'camio-fix-bundle-src' from scratch with OCE_USE_BUNDLE_SOURCE option, and then use RUN_TESTS target, all tests passed.

Which issue will be fixed by this change?