S9999: Adding resolution based defaults

Change-Id: I007e02f9ba79804353fa217fad12d7bb8a69fa51