Pulling in some updates based on posts-create branch