#579 Update doc to reflect necessary manual changes Implement a part of these changes to automatic script