Merge latest source code