Merge "Small code cleanup in folders, prevent crash issue 5082899"