Remkonoteboom/4.3

Cumulative fixes for 4.3