[5.x] Starter kit modules and other misc improvements

[5.x] Starter kit modules and other misc improvements #3339