Added options to linking stage only (for now)
Merge origin/master