pull in changes from pull 571