Fixes gh-499

Comment From: tzolov

Thanks @ThomasVitale This looks like a handy improvement that leverages the Spring ecosystem.

Comment From: markpollack

merged in 312156e2cbffb8d1e8ecfb0b4311004dc69a4a14

Thanks!