Merge pull request #9608 from champtar/phantap