Common

LIB
Revert "Common"

This reverts commit f95bb258e66b9bce301e8982d234084171af08c2.