NBBC: Merge master into stage.