1. some fixes

    Closed
    #73914464 12 0