Merge "Fix gradient shader + Remove comment about BorderlineColor" into devel/master