include patch bundle assembly
port code from WFLY master