Remove type safe repository and change flow dependency version
Merge branch 'release/3.6.0'