Merge "Fixes for enqueued adjustments"