Merge "BUG-509: there is only one createRecursively()"