Patch 12 Final

B258 changes