Merge branches 'gemini' and 'misc' into devel