Feature #0000235