LV compatibility

Change-Id: I1dfe3c3de1bc0624c01263218b76306e281cdbc5
Merge "LV compatibility" into development