Merged the latest changes from dev into this branch to stay up to date with current development. ref: N25B-236