Advanced search padding.
Merge branch 'release-2.3'