[TASK] Merge changes from work for westfalia