merge in finder plugin from development branch