Merge "[VVP] revert nested resource section"