Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9' * commit '52a3cb53ddcce049d2e804c3042514df576cb5b9': TypedProperties: change the file format to be a subset of Java
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9' * commit '52a3cb53ddcce049d2e804c3042514df576cb5b9': TypedProperties: change the file format to be a subset of Java