1. Align with imagery.

    Closed
    #176363597 4 4 0 0

  2. Minor updates

    Closed
    #176318199 13 18 0 0