BZ-9196 modify option