Merge branch 'develop' into lbudginas/#391_new_date_time_picker