Merge "Fix notification/builder defaults"