Merge develop

@AdeHub If you are OK with it and confident with your extra's changes, please accept PR.