Fixed STD/DST
Subproject integration