Merge pull request #2617 from wpaulino/no-persist-same-channel-update