am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop

* commit '72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9':
  Using ApplicationContext in static objects