Base security merge

- merged base security from commit 1d749e9ba41497c536029e5cedf27f4175edb40f