Merge pull request #639 into both front ends