[do not merge] Action plan bugs