Merge "fixing bugs connected with undefined parameters"