Merge "Add pushBlankOnStop fix." into main