I filed #2911 and #2913 accordingly.