Configurable rotation [2/2]

Change-Id: I311b14754702831197c007e4dfe42d8523b970c6