Merge 2014.04-GFN-WIP