Merge PR 329 into branch 5.4