Merge "Keep shaders to render properly"