fblogin v1.25
Merge branch 'release/v1.25' into develop