Merge "Fix crash on easter egg debug mode"