Merge "Fixing main process initialization code" into main