RAPTOR-RDP PUBLIC COMMIT

Signed-off-by: Arumator