Merge "Fixes the multi-backend skip bug and the cleanup steps"