Update changelog
Bring #3617 into master
Revert "Revert "Bit changed behaviour""

This reverts commit 670669cf40e1a28b6f0594a9c15643e1b2fc1083.
Tests passing on 2.6.0