Merge "Address STOPSHIPS in XfrmController.cpp"