Bring in changes from master
Update lamp3 in metadata