Merge changes from topic "casework" am: 26b47227d2

Change-Id: I80eec91653b27f45e490aea04d13c9e0ce53305d