master default bug7960 bug8004