am 1b490375: Merge "implement finish"

* commit '1b490375edadee7c389cb42f305cdcf1835587ad':
  implement finish