Fix 'false' test to used string compare and remove code from other branch
Merge branch 'default_no_comments' into type_list
Merge default_no_comment into type_list so we don't miss the reverted code on that branch later
Merge branch 'type_list' into live_edit