BEAN-00188: Cyril's Links