Add open issue
Fix merge conflicts
Address Martin's comments
Alfredo Pironti's comments