Merge "Replace searchlight asset" into klp-dev