Only show question mark when the previous check passed
Merge remote-tracking branch 'chiiph/bug/2569_show_question_mark_rev1' into develop