*** WIP: Squash with previous commit
*** WIP: Squash with 'save approve action as approved'
*** Fixed the approval link to include query params