MP1-4553 : Fix for basichome