Merge master with test gatekeep