BEAN-0014: Rakesh's Links