Add RFC-107 in branch-6-4