Catch up changes in the API

Ticket:	#5144