fixes #7685 changelog proofing - search by all tags
fixes #7688 inline edit condition on classname
Merge branch 'dev' into test
Merge branch 'test' into prod