Karen/snowager

@mdayaram