Merge from 2014.05.22 version