Moved a metric handler to post proxy call
Fix to metric deref
metrics defer regression
Merge branch 'master' into dev