#2331667 apply permissioning patch
#2372723 enotice fix