Merge 'test' gatekeep with 'master'