Merge branch 'fav-speedup' into 'develop'