Merge branch 'loading-crash'