1. Small improvements.

    Closed
    #176492358 13 6 0 0

  2. Small improvements.

    Closed
    #176492068 37 28 12 0