This developed and testing was completed by Tsz Kiu.
Merge details
mentioned in commit bafdd5ac
merged