include Preware PRs #13 & #14 in build