Merge last hotchanges for the demo