Merge "Dead code removal - Remove res_setoptions()"