Incorporate PR 638