Implement #1030 - runtime patching

Signed-off-by: Ross Allan <rallanpcl@gmail.com>