Merge "Fix handling options for mitaka,newton" into release/2019.2.0