Merge "Remove useless uniform register" into devel/master