2.5 to 3.0 merge + disabled GitLink