[REQS-540] PR corrections.