RF-13610: Re-instated some removed modules