bring functionality from 13 back to 12
Merge branch 'release/12.0' into release/13.0