We don't need devel patch anymore as 1.4 version already fixed the problem