Incorporate PR 637