Added missing changes from 2.2 to 2.3