Branch fro issue 1916

Branching for testing.