Merge "Handle gracefuly if changed items disappears" into mnc-ub-dev