Move validating of displayedId to a method
Merge branch 'quality_control'