Merge "Add inherited fields from hidden base to the stub classes"