Merge remote-tracking branch 'origin' into release
Fixed: trying to get non-object property when search is false
Merge branch 'release' into development