Photo's being duplicated when I edit in Gallery

[AC Question]

Hi.

When I edit a photo in my Gallery (crop, apply filters etc.) it saves the new version as the most recent photo and keeps the original in its original place among the gallery timeline. Coming from IOS this is quite annoying as I would rather a) the edited version supersedes the original version with option to 'revert' to original or b) it saves the edited version next to the original photo (even if the original was taken some time ago).

I might take a months worth of photo's before reviewing and editing and the current process is leaving my timeline all muddled up and photo's no longer in groups.