Updated to latest canonical github.com/IMQS/*