Updated changelog and CS fixes after PR merge