Merge "Add 'add derivedplan' console command." into ics-mr0