Merge "Refactoring of 'extractIpv4Mask' method"