split the plots into shifter and expert
This one is the same with !62165 (merged) but targeting at rel. 23.0 not master. Ping the shifters @jarguin and @honguyen .
This one is the same with !62165 (merged) but targeting at rel. 23.0 not master. Ping the shifters @jarguin and @honguyen .