Fixing compilation error that appeared after merging dev into this branch.