1. TNMoC improvements

    Closed
    #171501486 10 10 0 0

  2. Small tag adjustments

    Closed
    #171500431 0 1 0 0