Merge "Fix for private flavor list" into release/2019.2.0