[loader-v2] Addressing TODOs (#15316)