The purpose of this MR is to prepare for a MR to third party. I do not intend this branch to be merged.