Fixing commits related to Task #439