Merge "Add onBindClient for testing"