merged dev fixes for v2.4.3