Thank you for review. @Bakual This pull request is targeted at the `master` branch, do I need to send it targeted at `staging` or just need to update this with `master`?