Master update for adjusted config and compile with WM_LABEL_SIZE=64

Merged Mark OLESEN requested to merge master-update into master

Merge request reports