Merge branch 'release'
Merge branch 'release'
Removed cache of render search result because it kills availability fields javascript
Merge branch 'development', remote-tracking branch 'origin' into release