Forward feature SOLVE from PORTUGAL ISSUE 792