remove elvis operator.. seems to be causing NPE's on live deployment!?!
Merge code to prod from master