#434 Add yearMonth and yearWeek support for Scala
#427 Fix factory expression handling