Merge "Check if alignment to word boundary would cause an overflow" into oc-dev