[cosmetics] - fixed indentation after last merge
[changelog] - add note to changelog that the last feature is only working
properly on gotham