added 3 commits
develop
Compare with previous version
enabled an automatic merge when all merge checks for f3331dfe pass
merged