UWSDEV-41: fixing merge