Merge branch 'issue3602' into staging

Done as a merge commit since otherwise the conversion rules and their
application would have required splitting into two parts in order to
keep all commits in master compilable: too much mess for too little
benefit.