Merge "Removing unused variables" into devel/master