Tested, working.
Merge commit '0c9aeb0823291421afc4188de48755a676c19cb8' into development