Merge pull request #10275 from buddhamagnet/master

Increase readability of ternary statement in build method
use present? rather than in assert_template