merge latest developments