merge back from bay6

as title