Merge "Fix issues #3257701 and #3267312"