Merge branch 'release/7.x-0.48' into develop
Revert "also update cache settings"
Updating version number.
Merge branch 'release/7.x-0.49'