galera: rebase to revision 147