merge updates to lightweight dev