#2 Update from Mac Desktop local master branch.