Merged Lads Changes in

Merged lads changes in