[Bug-862333] Adding in habitat