Fix for "NoSuchFieldError: this$0$inlined"
Buildserver auto merge