Reverting to 3.6.0
Release v3.6.1