Merge "Return correct value at initDataInjection and avoid crash" into oc-dev