Fixed issue with nil kitten_data values
Merge branch 'refs/heads/certificate-page-redesign' into staging