Changes from 2.44-se to 2.50