Merge "TSMS updates settings properly in case of package changes"