Cherry picked alternative solution results to master