Merge WAPS Changes

@hyonholee