Merge "[pm] Implement the BIC service"