Bug 3097

#3097 and #3171