Forward feature SOLVE from PORTUGAL ISSUE 746