Refactor autotune to handle our current best practices

Ticket:	#4597