EXP-54. Fixes for move of Resources object.

Reviewed by: daisyzhou