Merge "Make decoder more robust to inaccurate ASCs." into jb-dev