Fixing confirmed report flattening
merge with master