Revert "Revert "Aligned labels with RNDT specifications""

This reverts commit 204477a1ec1e19099ec675b03e410f3bb764a37f.