Merge pull request #1066 from MrPetovan/task/9568-showmore_dyn-improvements