do not go beyond canonical commit if that is available