Fix catalog reload failure if amazon td is empty
Version 5.2.90.sp_rev.23
Merge branch 'develop'