Fix community includeInLayout bug
Fixed clone options