Updated for rat-4.4.0