Update for BS3 RC2