Merge "Shader Factory refactoring" into devel/master