2.20 changes for testing