Merged 2 commits form gtbluesky/patchrom_ns