Rebased and moved to branch 'labeling_dropshadow_5'