Additional changelog updates for 3.6.1