#3481 and #3482