Merge "Add static ip mask support"