applied patch
fix entity access controllers
address the review