Merge "Clean case declaration prototype"