1.9: Few optimizations

latest commit 187b70646e
@Jnmattern authored