Merge "Primitive visual bevel fix." into devel/master