I have created a separate PBI in order to address this issue as it needs some discussions / agreements.