Merge gatekeep test to master