P-100173 & #690 case

P-100173 & #690 case