Sync rfc 89 & 94 from master