Merge "Removed unused macro invocation from shader" into devel/master