merged from master (gotta figure out conficts)
full commit after merge from master