Applied code + compile patch to both parts of framework