Merge develop.

Signed-off-by: Gnanakeethan Balasubramaniam <gnanakeethan@gmail.com>