XD-1885: Introduce 'hidden' options