i manually merged and reverted this change for now, until the blocking issues are solved