Fixes #3244 - Extend app options parsing