#3528 final final commit