Merge "update defaults" into release/2019.2.0