Fixed the lost field parameters, and added unit parameter. Ticket: #1546
(cherry picked from commit 8d0c6d109e314b368a5465fd0379339f52ffdf04)