[completes #70218184] commit to github and sync with pivotal tracker