Fixed issue with Spring context creation
Merge branch 'mbst-10179-last-updated-time' into stage