[WIP] Extended QS options (2/2)

Change-Id: Icc4eef0a80ada1a70ba9a8aff643188bd9477c78