Merge "Fix source frame border extension"