manual merge to close #390