Merge PR 1237