Speed up loading gif
Merge branch 'master' into MNF

* master:
  Speed up loading gif