Merge "Revert "Implement detecting container violations."" into main