Upstreaming Jolla's work