automerge: bce7231 * commit 'bce72316c5ef39dc4669a8e0a023d43c78535bb4': Fix missing subscription list changes