Merge "Add persist.apexd. property context."