8-bits align removes unneded shift operations (cherry picked from commit 6ff8ce5bffb69d7c6d961bda26d579fa44e37801)