Merge "Revert "Addd to check privilege for capture"" into devel/master