Merge changes I02646ed9,Iec8e6fa4 into main

* changes:
  Augment blueprint command line tool
  Add parent class for shortcut sections