* commit 'ef44c0514d497a789dca4731da61a2cf49bb3289': Work on issue #18572506: AppOps in-memory state is invalid after...