Pull for mauro

this PR supersedes #4048