Merge pull request #5965 from loopur/mybranch