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