Fixes for OOIION-683: Auto-accept for acquire resource