Feature housekeeping

@bsaiken : feature branch merged to dev branch.