Various Changes from Sandbox-B