Merge remote branch 'starbase/devel' into devel