Backporting fixes from 2014.05