This is a task to address several redactions occurred at the RTF, to align the implementation with the actual details of the specification voted.