diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index c0f258131..c9af74748 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -12775,7 +12775,7 @@
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">						
+				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
 					<xsl:apply-templates />
 				</fo:block>
 			</xsl:otherwise>
diff --git a/xslt_src/plateau.international-standard.core.xsl b/xslt_src/plateau.international-standard.core.xsl
index 8ec06946e..52bedb60c 100644
--- a/xslt_src/plateau.international-standard.core.xsl
+++ b/xslt_src/plateau.international-standard.core.xsl
@@ -1170,7 +1170,11 @@
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
 					
-					<xsl:if test="parent::plateau:clause">
+					<xsl:if test="parent::plateau:note and not(following-sibling::*)">
+						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+					</xsl:if>
+					
+					<xsl:if test="parent::plateau:clause or (ancestor::plateau:note and not(ancestor::plateau:table))">
 						<xsl:text>&#x3000;</xsl:text>
 					</xsl:if>
 					
@@ -1192,6 +1196,41 @@
 	</xsl:template>
 	
 	
+	<xsl:template match="*[local-name() = 'note'][not(ancestor::plateau:table)]" priority="2">
+	
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			
+			<xsl:call-template name="setBlockSpanAll"/>
+			
+			<xsl:call-template name="refine_note-style"/>
+			
+			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+	
+				<fo:table table-layout="fixed" width="99%" border="1pt solid black">
+					<fo:table-body>
+						<fo:table-row>
+							<fo:table-cell padding="2mm">
+								<fo:block keep-with-next="always" margin-bottom="10pt" role="SKIP">
+									<xsl:apply-templates select="*[local-name() = 'name']" />
+								</fo:block>
+								<fo:block>
+									<xsl:apply-templates select="node()[not(local-name() = 'name')]" />
+								</fo:block>
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+				</fo:table>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template>
+	
+	<xsl:template match="*[local-name() = 'note'][not(ancestor::plateau:table)]/*[local-name() = 'p']" priority="2">
+		<xsl:call-template name="paragraph"/>
+	</xsl:template>
+	
+	
 	<xsl:template match="plateau:termnote" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
 			<fo:list-block provisional-distance-between-starts="{14 + $text_indent}mm">