Merge pull request #11156 from jmarcet/nyx