Merge Development updates for version 3.6