Synced with competition branch of configuration editor.