Allow rebuilding when reaching the enhancement limit.
Merge remote-tracking branch 'origin/master'