Merge "Fixes for access creation and removal"