Merge branch 'develop' into lbudginas/#374_calendar_dates_selection_bug