1. various updates and changes

    Closed
    #175164645 13 5 3 2