Merge "system properties: doubling the shared file size to 256Kb" into main