SQUASH ME: backport #1407