- Multiple Fixes & updates for release 3.6