Merge "Adding uniform block handling for modern shaders" into devel/master