Merge "Fix static properties to comply with VTS"