[ issue 1283 ] Added missing type signatures
Merge branch 'maint-2.4.2'