Changes from the last 2 commits applied to rfc3315bis.xml