Revert "Merge branch 'help-nanofixes' into 'master'" See merge request !73
mentioned in commit ee4608e6