Previous commit was against older sources.

Current commit should be merged to master to add the labels in taskbar feature.