MOTECH-1276 fix & CR feedback

Change-Id: I56d1c53aa0189482074eba0f9fca953471e837f2