CORE-5634: Added static debug ids to flag prope editor
CORE-5634: Code cleanup