Updates for DF 40.22