Issue #413 Changed as well in root repository