s4-common updates