Merge "BUG-614: migrate RuntimeGeneratedInvoker"