@pepol can we specify when it's better to keep commits separate?