Committing to get merge devel into mine

Author: @akshoop