Changes required for version 20.10