CC 2017 - Selection > apply comment > PHP, HTML, (etc)

Sorry if this isn't quite clear... I'm unable to locate this handy feature in CC 2017. Previously (CC 2015) selecting a large chunk (or small snippet) of code and right-click (or perhaps it was via Tools > Select? Sorry, I can't recall at the moment) allowed you to apply comment tags, choosing PHP, HTML, CSS, etc as the target selection.

ie;

<? /*

     <?php if( ...

          ...

     <?php endif; ?>

*/?>

or

<!--

     <section>

          <h1>Commented out code</h1>

          <p>...</p>

     </section>

-->

etc, etc.

Has this feature been removed, or just tucked away someplace? A shame if the former as I used this often in various stages of development. Handy and quick.

Thanks in advance!