#3528 final commit