bug_6711 default master