0.9.3.1 changes re-applied

Re-applying 0.9.3.1 changes to flag discrepancies and regressions to
correct.