Insert Link to Create Page from Template

When adding a link using [ and selecting Insert Link to Create Page, you don't get the option to create a page from a template. Use cases and expected behaviour:

Use Case A

1) You create a link as a placeholder to be filled in later using the Insert Link to Create Page
2) You save the page
3) You click the link, the Create Page popup shows and allows you to select Blank Page or Page from Template
4) You fill in the template and save
5) The parent page contains the link that now instead of a placeholder points to the created page

Use Case B

1) You create a link as a placeholder using a new option Insert Link to Create Page from Template
2) You have the option to specify which template to be used
3) You save the page
4) You click the link, the template shows ready to be filled in
5) You fill in the template and save
6) The parent page contains the link that now instead of a placeholder points to the created page

The Create from Template macro is not really a solution because it doesn't fulfill the expected behaviour in the above use cases. Implementation of either A or B would be acceptable for me, similar with slightly different advantages each.

Related issues: https://jira.atlassian.com/browse/CONF-23884, https://jira.atlassian.com/browse/CONF-28710