Do strict check on MAC.
Merge remote-tracking branch 'origin/4.0'