Merge "Cleanup on async disconnect and finalize" into jb-mr1-dev