Merged master new rfc 94 into branch-6-2