Removed deprecated page and option.
Merge remote-tracking branch 'Upstream/develop' into develop-search