Applying missing changes from 7e5751