Merge "Prevention for being assigned NULL value" into devel/master