Release/3.4

See commit commentaries of the two files