Proposed upgradeversionfix resolves #539