AMF branch initial commit.