MOD-5476: Creek's Links