adjustments to latest HEAD of rescue branch