Merge remote-tracking branch 'origin/devel-whitelist-context' into devel
added default values for breakdown for possible totals
Merge branch 'devel'
stacked columns based on unit-measure naming rule pc_indicator