sp-v2-22 #674