Merge "Added survey support to second fragment type"