Merge remote-tracking branch 'refs/remotes/breton/bug/647'