Dec flag

The recent merge was to dec_flag, but not actually against master. This PR is to merge with master