Pulling in changes from HyeonJe Jun's master