PLAT-6691 - Enable optional property placeholders

 - additional test