Manual Merge from SPA2014