[Andr] the next one big merge

too many changes for one merge but I haven't a choice. Sorry guys