Merge "[!!!][TASK] Disable rewritten property mapper by default"