RLP-4421
Work in progress and halted for the moment.