Update to v 3.6.1