I'm back
Merge and service bind leak fix