Code update to rev 1e74864ca80261e71e49b2aab3778672d6574907