1. fix strange data after adjustment for data conflication

    Closed
    #170906879 0 3 1 0

  2. (no comment)

    Closed
    #170906832 571 24 105 0