Master & branch finally completely synchronized