Merge pull request #15435 from cotequeiroz/atheepmgr