Merge commit '5919f2b829149bfe51a1939b567232d66eb810ff' into pandora-port