Final state
Fallback functionality is implemented for some cases and a bug fix

Bug fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=416118 has
been implemented.