observer changes to 2.16.1 branch