Needs to be checked with live system before merge due to nature of changes.
merged
mentioned in commit 07da9d6e