Addresses issue #3265969 and #3260620