merge latest v5 into fork