SONAR-5134 Fix infinite recursion by protecting against render/onRender loop
SONAR-5134 Apply new rules for sorting
Fix quality flaw