Merge remote branch 'bluematt/defix2'