Dev 0.8.6.2

Development to master