Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev