cbpapp validation added
merge from joe