#4801 - fix and extends controller guide