Merge branch 'dev_get_rid_of_ternary_operator'