apply changes from upstream 2014.0322.1232