TAMAYA-19: Code cleanup.
TAMAYA-19: Code cleanup.
Merge remote-tracking branch 'origin/master'