Merge pull request #11159 from jmarcet/ctop