spring configured in panel .. get directly from context
Merge remote-tracking branch 'origin/develop' into develop