Roll up of recent changes on my development line.