Merge latest changes into lyst sofiapy