Merge "Improve the net-capabilities scheme for backward compatibility"