merge squash 4.3 update (WIP)