[FIXUP b6c1978, SQUASH ME] address Martine's and Hauke's comments