Merging opt-3.1 into nepi-3-dev