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