Merge "Prevent render of outline, shadow when transparent" into devel/master