Add support for internal resources
Merge remote-tracking branch 'adrian/internal-resource' into develop