state configuration from cache
more caching
Merge remote-tracking branch 'remotes/bluesoft-rnd/RELEASE-2.1' into RELEASE-2.1-JSP
more adequate name
Merge remote-tracking branch 'pjolszewski/RELEASE-2.1-JSP' into RELEASE-2.1