Merge branch 'dev': GsDevKit support