Merge changes I0b0443d5,Ic454a87a into integration

* changes:
  fix(gic): quote the correct flag on error
  feat(lib): add a generic EXTRACT macro