Merge "diag: Fix feature mask received check"