Merge branch 'fixes_for-3.6' into fixes