Revert "Revert "KFSCNTRB-1459 Removed jira comments and added null checks by ObjectUtils.""

This reverts commit fb38d151f28252e46865b3ca94ac552b887d804e.