Partially implement runtime patching

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

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