Merge "Update configuration to build amsterdam branch"