Merge "remove invoke_search macro" into experimental