gm #1130

merge