Merge "Replace searchlight asset with new new asset" into klp-dev