MesaLib-git: merge MesaLib changes