Add fields to apply permissions with more granularity

Ticket:	#5838