aquaveo/stable: links for piyush-somani