Indev fullopts

Final branch merge.

Project ended.