Merge pull request #10829 from TRox1972/pornoxo_improve