Merge PR 3564