Merge "Fixing static analysis errors in uniform block demo" into devel/master