1. Fixed "noncanonical brand" issues

    Closed
    #139876959 0 26 0 0

  2. Fixed "noncanonical brand" issues

    Closed
    #139876868 0 23 0 0