Merge "Avoid making master connection from Skin::getUndeleteLink"