Merge "Adds "more option" section." into tm-qpr-dev