Merge "Revert "Added tag for capture privilege"" into devel/master