Merge commit 'refs/changes/02/144402/6' of https://git.eclipse.org/r/rcptt/org.eclipse.rcptt