Issue #21241:honor opstage_opinactive when inserting
Merge pull request #43 from garyhgohoos/21241

Issue #21241:honor opstage_opinactive when inserting