Merge "Make OP_LEGACY_STORAGE stickiness configurable" into rvc-dev