Adding changes from 3.3.6