[HOMEFREE-143] patches