Merge pull request #3455 from cenewcombe/develop