Merge reload-branch up to revision 101000