updated changelog
Merge remote-tracking branch 'origin/production_realtime' into production_realtime