Merge "Swap maintenance fix to cleanup step"