Replace mod operations with bitwise AND where possible
ISPN-3437 Move some dependency management to BOM as it is common with server