Merge branch 'sharlikran-valda-fallout-update' into dev-sharlikran-valda-fallout