Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'