Merge pull request #5095 from kumpera/fix_fullaot