Commits on stolas-builder-fix

committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed
committed