3.1.6 after git fixes