aquaveo/stable: links for 102216076-armandeep-singh-dhillon