[ShareRapid] Updates
Merges #619