Added comment about label* fields
Merge branch 'dev' into ms