KFSCNTRB-1020_CR Implemented requested changes from Foundation's

crucible review.