[IMP] Latest changes from PR