Merge branch 'crash-659118'