0025439: Enabling shape binary persistence without OCAF