Fix aruba timeout
Merge branch 'fix_timeout'
Exclude Pending Features