Merge "Fix invalid texture use" into devel/master