1. Fix & add fine-grained details

    Closed
    #169965271 18 19 13 0