Implemented EPIC integration patch bug fixes