[NGRINDER-690]  Fix bug.
[NGRINDER-690]  Fix bug.
Merge remote-tracking branch 'remotes/origin/master' into compact_page_with_macro