Merge commit '1a978cb460194e7f3db4c8d8bf6405411b2f9bcd' into epm