Merge "Fix dynamic_ownership" into release/2019.2.0