Merge pull request #5263 from selanf/b1