Merge "In ShortcutService, save data of each package in a separate file" into rvc-dev