CAESAR II still implements the 2006 edition of B31.4 (due to errors in the following editions of this Code). The 2015 version of CAESAR II will address the 2012 edition of B31.4, which appears to have corrected the errors.

Yes, I believe that now B31.4 aligns (again) with B31.8 regarding restrained vs non-restrained piping.