Merge "Fix bug 564"