Menu token 3404802 remove redundant if statement
requested to merge issue/menu_token-3404802:menu_token-3404802-remove-redundant-if-statement into 9.1.x
This is the same as the MR!12 by Chetan 11. But I have removed what seems to be a redundant if(empty()) check.