Merge "Drop odd keys from structure" into release/2019.2.0