Merge branch 'master' into dev-shz
attemp to add Search Action
Merge branch 'dev-shz'