add catalog view
merge from zhang
merge from zhang
merge from zhang
merge from zhang
merge from zhang