Merge remote-tracking branch 'rose-project/master'