Bugzilla/907013 master new/v2