dev to 4.1 merge 1/26 to 2/7