Merge "Skip backup the pinned container" into main