Improvement/3.x/invocationimpl cleanup 3