Update tw5 with latest from upstream and decode fix