Merge remote-tracking branch 'github/devel' into devel