Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev