d2-common and if-common updates