1. Small fixes for a data

    Closed
    #57032861 0 1 0 0

  2. Small fixes for a data

    Closed
    #57032633 0 1 0 0