Merge pull request #2301 from rpv-tomsk/fix-apcups