Merge "Change @return to start with type"