[DO NOT MERGE] Testing PR for issue 542

For issue #542.