Merged Dev's v4.1 into v6