TRUNK-3951 Follow up improvements