Merge with Nex + Action plan fix (pending)