Feature/ipcb 1014