merging the nepi-3.0-pre-release branch with nepi-3-dev