[TASK] Use ApplicationContext when available
Merge pull request #139 from hmspl/freedom

[TASK] Use ApplicationContext when available