Merge "Fix shadow bounds calculation"