Merging lokeoke's fixes from master to develop