Merge branch 'bw/diff-opt-impl-to-bitfields'