Will retest/update today (was waiting for fix for #4851 to get merged).