Automatically added bug-836379 checkout from ae1e133