bea5308ab7
This has been done in preparations for rewrite to kotlin and upcoming design changes. Nothing should be broken but use caution.