REL-319 REL-320 And catch up with latest Apache 0.9 bugfixes