backport: avoid two trigger call for collection during move