Merge "dx: Add support for invoke-custom"