Merge to maintenance
Merge pull request #966 from sancar/fix/maintenance/issue-962

fixes issue #962