Ad resolver
no message
Remove scripted files
Merge branch 'release/3.3.0'