Merge "Avoid "Unable to set value to APCBagOStuff" exceptions"