Merge test rev5c with rev6