Merge back from technology-2014-10-23