Merge "Fix for dynamic properties persisting between service restarts" into main