Pulling in some stuff from master
added in async view notofication api