Revert "Revert "Common""

This reverts commit 87b383684712fbe0c8b7ce84b7c35b3250985191.