PIM-1597 Model changes and feature disabling to go forward