Merge with LS2014 source