Squash-merged in issue_554 branch, #554