Switched develop to upcoming release 3.1.8