Merge "Refactoring of highbitdepth bitshift operations"