Merge trunk into branch "invoke-invocation"