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

This reverts commit e07ee6b57bf20eb5603a5c7ae03595fe039fdc83.