Merge "Fix check of setting volume options" into release/2019.2.0