Merge branch 'release/3'
stricter match for merge commit to develop
age of oldest ancestor should be less important