made the way of adding / enabling characteristics more generic
Minor things to try out with STR macro
Merge remote-tracking branch 'upstream/generic_add_characteristics'