v7.1 merged from Bacra