Various improvements noted in EP1829 that warrant integration, but need proper code refactoring and integration.
@Taka, @Azami @Mattijs