RF-13586: JavaDoc corrected & return statement simplified