Merge updates from GSXP/sidekick