Merge pull request #3363 from sesom42/develop