add p940 cherry-picks