Merge pull request #475 from Dmitry-Me/splitAccessAndAdjustment

Split access and pointer adjustment