Catch up latest changes in AFP sharing/services

Ticket:	#4997