Improve development performance

A revised version of this pull request, asking to merge it into the develop branch.