Merge "visual_modifications" into master.

LONG TIME COMING, ISN'T IT.