April node update

Merged Matthieu BENOIST requested to merge updates into master

Merge request reports