Merge pull request #15732 from totten/master-tplaner-when