Merge branch 'PLA-1192' into dev

Fixed Search expand