Add patch to fix issue on homebox save of custom block