No bug: commit the whole patch; a=orgonly
Merge default -> production