Revert "[ticket/12696] Some commit message issues"

This reverts commit f655a7ac9b1ed46f8703862efbe579fa5ac50e05.
Revert "[ticket/12696]"

This reverts commit 3d7be93a836e02c5bc5a786b089fce95ca7cc6e6.
Revert "[ticket/12696]"

This reverts commit 637990ddba497e26ca333c3e51028e6d41092d9e.