[2888] Improve code for Grandmaster Vorpil