Merged changes from develop. Refs 34b483e76d58d332e18ff43fac2473a466ed8786