[HOMEFREE-6] patches