Bring gasteve/soop up to date with latest code changes from Matias