7.x 2.0.x

Fixes for empty entity properties, contextual links and unnecessary closing delimiter in example file.