Adjust for layer updates, merge from 2014.12